Merge "Merge cherrypicks of [1386419] into androidx-concurrent-release" into androidx-concurrent-release