Merge "Snap for 6922857 from 513926fc07f451c58e0c346a9c214018eca858fd to androidx-master-release" into androidx-master-release