Merge "Support uid/pid in PermissionEnforcer"