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