Merge "wifi: Set subscriberId for the merged wifi network" into sc-dev