Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev