Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598 Change-Id: I413c08fc365319302f5a5885c846523404e1f942 Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>