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