Merge "Use non-root user in Dockerfile for a1-policy-management-service"