Merge "Snap for 5510949 from 20c6dacf4b4f2bfa6cbbecb015fc22df7d25eb0a to androidx-collection-release" into androidx-collection-release