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