Merge "Remove duplicated setCompanionAppUids() line in CdmService"