Merge "Add tests for edge view to the LinearLayoutManagerSnappingTest" into nyc-mr1-dev am: 7cbaea88bc
am: cff2cddb55

Change-Id: Ifec5b12beae02a61b522ab59baa641d9c4425241