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