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