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