Merge "[automerger skipped] Merge "DO NOT MERGE Revert "Fix testShouldOverrideUrlLoadingOnCreateWindow"" into nougat-cts-dev am: ac574e733a  -s ours" into nougat-mr1-cts-dev
am: a32a011800  -s ours

Change-Id: If4bcde965d835991047934454e4be3ba068c123d