Merge "Merge "Test: Drag on the divider line." am: 1fa3a60f05 am: 290bfff7d0 am: 8ad2dc3615" into oc-mr1-dev-plus-aosp
am: 6122b0921a

Change-Id: Iafb3905f117ba03e203bae7e619e3c8fec2a0999