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