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