[automerger] Merge "Merge "[webview] fix testOnJsBeforeUnloadIsCalled flakes" into nougat-cts-dev am: a9c86effe4" into nougat-mr1-cts-dev am: 2c0d76c319 am: 9ed97b0788

Change-Id: Ic1ae7ec02c5fbfd680d1e24c439ad68e6ef24ee2