Merge "Fix kotlin nullable errors in Settings" into aosp-main-future