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