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