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