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