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