Merge "Fix usages of getCallingUserId()/Uid() in CdmService"