Merge "wifi: Add instance identifier in SoftApInfo/WifiClient and infoList callback"