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