Merge "Merge "DO NOT MERGE: Fix WebChromeClientTest#testOnJsBeforeUnload" into lollipop-mr1-cts-dev am: c0b20c4  -s ours" into marshmallow-cts-dev am: 69f1ac8  -s ours
am: e602d04

* commit 'e602d04308fa37a91548deac7161d4001ea07ab6':
  DO NOT MERGE: Fix WebChromeClientTest#testOnJsBeforeUnload

Change-Id: Idf7cfa49fc0d4b0edca315e9469aac93833779f8