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