Merge "Snap for 13417345 from f4bfff3d2414adc094a989d4f81fb121abe55c3f to androidx-recyclerview-release" into androidx-recyclerview-release