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