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