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

Change-Id: Ifc5b055fb103cfb6357c032364317bada0d648ad