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