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