Merge cherrypicks of ['android-review.googlesource.com/3838841'] into androidx-activity-release.

Change-Id: Ie507bb6c8b543396a92b4d746e052158da76df5a