Merge "testHoverMoveMultiple fails on ldpi devices" into oreo-mr1-cts-dev
am: 8800c8e4b6

Change-Id: Ifbd466492a5ca0877400b540e48c745c079c2758