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