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