[automerger skipped] Fix kotlin nullable errors in Settings am: 84f8961e67
-s ours
am skip reason: Merged-In I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0 with SHA-1 87b870a090
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24423374
Change-Id: If4eb9729494d88dd9b6e1e0a3337efe499b4498c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: