Merge "Add ChannelStats to the WifiUsabilityStatsEntry" into udc-dev