Merge "Merge "Move back up before starting another test for longer vertical movement." into pie-cts-dev am: 8b4c3e6b75" into android10-tests-dev