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