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

Change-Id: I3c64c12968f2a94cdd2935c22935ac933456df87