Merge "Merge "Exclude CtsDeviceJankUi#testScrolling from cts-reference-aosp" into oreo-cts-dev am: 42302f39dd  -s ours" into oreo-mr1-cts-dev am: 8e13acc32f  -s ours
am: 98abc56531  -s ours

Change-Id: I6a6605c1ded8970a339b2a43eeeae5ad6705bfb3