Merge "Make unit test extends WifiBaseTest to avoid OOM" into udc-dev