Merge "Exclude CtsDeviceJankUi#testScrolling from cts-reference-aosp" into oreo-cts-dev am: 42302f39dd
am: 01dcd498d2

Change-Id: I815c2f4badc437518e77e376048e889da43e9c11