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