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