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