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