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