Merge "Use getCallingPid for pid instead of getCallingUid." into tm-qpr-dev