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