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