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