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