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

Change-Id: I2891d3da213ff8b405a08e7f95158434d5394346