Merge "Merge cherrypicks of ['android-review.googlesource.com/3276811', 'android-review.googlesource.com/3283615', 'android-review.googlesource.com/3315628', 'android-review.googlesource.com/3315341'] into androidx-annotation-release." into androidx-annotation-release