[automerger skipped] Fix kotlin nullable errors in Settings am: ee87a406 -s...

[automerger skipped] Fix kotlin nullable errors in Settings am: ee87a406 -s ours am: b50a062c -s ours am: 3f8c8ba9 -s ours

am skip reason: Merged-In I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0 with SHA-1 753c9613 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24724914



Change-Id: I648ef6d76dce26c33f26e55cbe8c36ad0d0f3188
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>