Merge "Fix kotlin nullable errors in frameworks/base" into main