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