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