Merge "Stop running RecyclerView prefrech tests on pre API 21." into nyc-mr1-dev
am: 2750d740df

Change-Id: I01b946f4901c7006acad8023491119f73147022f