[automerger skipped] Fix kotlin nullable errors in Settings am: 8f7a1e6f -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/+/24693315



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