[automerger] Merge "Merge "Fix timing-sensitive WebView test and improve framework." into lollipop-mr1-cts-dev am: 60c01748" into marshmallow-cts-dev am: 9b142f2a am: 3f5bc1ec am: 20ecdfcd am: 332dfc34 Change-Id: Iedc60a291bb1e9192211fe534dd1cc301acaa824