[automerger] Merge "Fix testShouldOverrideUrlLoadingOnCreateWindow" into nougat-cts-dev am: f20c128319 am: cb92e927d7 am: 10db120edf am: 78e7dde72b

Change-Id: Iad933d3a35c429840a4f33d54881c0b9308ee2ee