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