Merge "Snap for 13356825 from 22b5d3d16ad9c1583599631cf4e415e204aaed81 to androidx-activity-release" into androidx-activity-release