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