Merge "Cherry-pick: [Android WebView] Fix crash in M38 WebView." into m38