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