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