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