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.

Change-Id: Ibf578a60e65ff1c33a34234f2d4632f6fd0c5720