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