[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 am: 332dfc3490 am: a9792d9933 am: 4d89ffda17 am: c4a0baa81 am: af142c1755

Change-Id: I99b712319f8b9a89d878da85d6a7fbb42f5f56fa