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