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