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

Change-Id: I6f8356392ed55af1ff84573e29ec86fe48e37fab