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