Merge "Remove vendor apex privapp allowlist pruning" into tm-dev