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