Merge "Merge "aw: Correct doc of addJavascriptInterface()" into qt-dev am: 62c764e29b am: a4604013ae" into qt-r1-dev-plus-aosp am: 4d018e90f0
am: 4f1508d15e

Change-Id: I273cd0f3e08879af2b7f2a2c3a855d0d0a01893f