Merge "Add unit tests for the QoS APIs in WifiServiceImpl." into udc-dev