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