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