Merge "policy_hal: Fix to route the call to proper device"