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