Merge "Merge cherrypicks of ['android-review.googlesource.com/3067462'] into androidx-annotation-annotation-experimental-release." into androidx-annotation-annotation-experimental-release