Merge "Fix permission check in DPM.getPermissionGrantState" into mnc-dev