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