Merge "Snap for 5354290 from f094924d2540421b8a578359d104e16388821150 to androidx-master-release" into androidx-master-release