Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799717 Change-Id: I60e162d8889d087b091985c32be9542483944e36 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>