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