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