Merge "Cherry-pick: [Android WebView] Make evaluateJavaScript return with no-op." into klp-dev