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