Merge \"Fix RecyclerViewLayoutTest\" into nyc-support-24.1-dev
am: 958c834cca

Change-Id: I1df1caceaf76e1309ae9ddcfe120538136775aee