Merge "Merge cherrypicks of ['android-review.googlesource.com/3276616', 'android-review.googlesource.com/3276416', 'android-review.googlesource.com/3248660', 'android-review.googlesource.com/3205692'] into androidx-annotation-release." into androidx-annotation-release