Merge "Fix more kotlin nullable errors in Launcher3" into udc-dev-plus-aosp