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