Merge "Reland WebViewClientTest testOnReceivedLoginRequest test fix am: 739bdc291f  -s ours" into nougat-cts-dev