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