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