[automerger] Merge "Fix timing-sensitive WebView test and improve framework." into nougat-cts-dev am: 69aa94d073 am: dc399ab415

Change-Id: I2392c1ee916e99ee3778fd2fb67a1c1b09e6d11f