[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 Change-Id: Ibdd25c3a2ac1fe6172f99c530be27e1277013ec0