Merge "Stop running RecyclerViewCacheTest on pre API21 devices." into nyc-mr1-dev