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