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

Change-Id: Ibdf83a6d24b0a10c5f3fce56039954c7d3c07c1d