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