Merge "Snap for 11610999 from 7c71e2b5512bcd16bd7bcaa6fa882925038b4c32 to androidx-activity-release" into androidx-activity-release