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