Merge "Use apex name when querying privapp allowlists" into tm-dev