Merge "Merge "Fix incorrect regex in WebView useragent test." into nougat-cts-dev am: 3be3b758" into nougat-mr1-cts-dev