Merge "Revert "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig""