[automerger skipped] Merge "DO NOT MERGE Revert "Fix testShouldOverrideUrlLoadingOnCreateWindow"" into nougat-cts-dev am: ac574e733a  -s ours skipped: 491f526165 skipped: 023d198850 skipped: fc2ddf3578 skipped: 54f3651a35

Change-Id: I8b5d7b45cd4b94a61c6b09b5bc8f70b1ff993563