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