Merge "Updated the RcsCapabilityExchangeImplBase APIs"