[automerger skipped] Merge "Fix kotlin nullable errors in Settings" into...

[automerger skipped] Merge "Fix kotlin nullable errors in Settings" into aosp-main-future am: f87c5f2c -s ours am: 70763174 -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: If4e4528144c582186b92ad5c75a71175f7d6edd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>