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

Change-Id: I7859ee4c48296b7c04eb17b56f3e92b8f5665faf