[automerger skipped] Merge "DO NOT MERGE Revert "Fix testShouldOverrideUrlLoadingOnCreateWindow"" into oreo-cts-dev
am: 9d4022129b -s ours
am skip reason: subject contains skip directive

Change-Id: I1102e752860ebe208e7c105988164966f996a86c