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