Merge "Fix StaggaredGridLayoutManagerCacheTest to avoid older versions" into nyc-mr1-dev
am: 30d844c7b6

Change-Id: Ib1f1991660926e1e8429874a0b9ee00453e7eb42