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

Change-Id: Icae2430d1823d9e9170a0d7caa5e380c3d5faedd