Merge "Merge "Merge "Fix testShouldOverrideUrlLoadingOnCreateWindow" into nougat-cts-dev am: f20c1283" into nougat-mr1-cts-dev am: 295f4e9d" into oreo-cts-dev