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