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