Merge "Snap for 9043708 from bbcaaacdadb8ea3c50466287db02466023ce9bea to androidx-recyclerview-release" into androidx-recyclerview-release