Merge "Add policy-api to xacml-pdp config for OOM"