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