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