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