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