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