[automerger] Merge "Merge "Fix timing-sensitive WebView test and improve framework." into lollipop-mr1-cts-dev am: 60c01748a8" into marshmallow-cts-dev am: 9b142f2af7 am: 3f5bc1ec7d am: 20ecdfcd35

Change-Id: I982552b6e9bbc025f77b0b5ffc76297f666b1759