Merge "Modify user agent CTS test to match new webview user agent string." into lollipop-cts-dev