[automerger skipped] Fix kotlin nullable errors in Settings am: 753c9613 am: 918e687c -s ours

am skip reason: Merged-In I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0 with SHA-1 84f8961e is already in history

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



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