Merge "Update usages of WifiRadioCombinationMatrix in the framework." into udc-dev