Merge "Merge cherrypicks of ['android-review.googlesource.com/4030063'] into androidx-xr-compose-pre-release." into androidx-xr-compose-pre-release