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