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