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