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