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

* commit 'eb4eb9e9176ec145b4c622828ab7337fb6f75e4b':
  Revert "Modify user agent CTS test to match new webview user agent string."