Merge "Deflake WebViewTest#testPageScroll" into lollipop-mr1-cts-dev