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