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