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