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