Merge "[webview] fix testOnJsBeforeUnloadIsCalled flakes" into nougat-cts-dev
am: a9c86effe4

Change-Id: Ic52bcbe643811771ffd3cd129a7350b81a4ddf8d