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