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