Merge "Snap for 8962846 from bbcaaacdadb8ea3c50466287db02466023ce9bea to androidx-main-release" into androidx-main-release