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