Merge "Merge "Replace unencoded '#' with '%23' in WebViewTest" into nougat-cts-dev am: 0f552257" into nougat-mr1-cts-dev