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