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