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