Merge "Fix permission javadoc about whitelisting." into qt-dev
am: 4918e711d3

Change-Id: I28a53f02f8cfc41c8ce6e23976f7efd4fdb3fa90