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

Change-Id: I1c8b4ca10fcd2b8ae1c9327d86500cef308d8a59