Merge "Test: fix WebView testFindNext flakyness" into lollipop-mr1-cts-dev