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