Yes, that's correct. When provisioning the APs in AOS, the antenna gain number (in dBi) from the datasheet should be used to make sure the SW correctly calculates, sets, presents and limits the transmit power for the AP. All RF power numbers in the Aruba software are in terms of "EIRP power", which includes the antenna gain.