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