Merge "Merge "Fix for the missing focus in WebView form fields." into oc-dev am: c34dec82a9 am: d2cca60d09" into oc-dr1-dev-plus-aosp
am: ee49b9e1e1

Change-Id: Iff8abd6e78cd9a93a93700407fbda1646a8a2f2b