Merge "De-flake testOnJsBeforeUnloadIsCalled" into nougat-cts-dev
am: d82b89d0ab

Change-Id: Ia177baeaed353de8c026b9665173c7312e2a4770