Merge "Merge cherrypicks of ['android-review.googlesource.com/3291186'] into androidx-glance-release." into androidx-glance-release