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