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