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