Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19893206 Change-Id: Ibb4eb46ab387682f595162414c4ecb4f2dad5c7a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>