[automerger] Merge "[webview] fix testOnJsBeforeUnloadIsCalled flakes" into nougat-cts-dev am: a9c86effe4 am: 0a30bc5b6a am: a449cb818d am: e29e353d8e am: 3c8200e5a5 am: 25b1ab1b4b am: d9511cff40 am: 710d6f6488
am: 8d190f82aa

Change-Id: I0b6ef10c79c34d3c04146a1f756096de8cb1d8f4