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

Change-Id: I6ecf316567e3ce0203ea9cf7ff8ffaea28e1a2ed