Merge "Merge "Merge "Merge "Fix WebChromeClientTest#testOnJsBeforeUnloadIsCalled CTS test." into marshmallow-cts-dev am: 33389e12c4" into nougat-cts-dev am: 56cc145a7d" into nougat-mr1-cts-dev am: 45ac0b937e" into oreo-cts-dev am: 730645871c
am: fb24bfc9e4

Change-Id: Ic9c4263a8aae7d4645cb2649f25e07d243c7b5b0