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