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