Merge "WifiHal: Always include the Service responder policy"