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

Change-Id: I217e47288215a44572e21a6e43f87a98fb03aeec