Merge "Snap for 7024209 from 0edb238eb36561b1e4cf8045481c8ef51ccc4474 to androidx-master-release" into androidx-master-release