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