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