Merge "HAL changes for 1.5 setLinkCapacityReportingCriteria"