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