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