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