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