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

Change-Id: Ibc93b7cb9d6a84a81c0df8c2824c141f27d1e713