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