[automerger] Merge "Merge "Fix timing-sensitive WebView test and improve framework." into nougat-cts-dev am: 69aa94d073" into nougat-mr1-cts-dev am: c2f56b9a3c am: 86697f939f am: 4b35f3de18 am: c14b3a7ce2

Change-Id: I8258df08d642e50499c41fce3254d10c4f116adc