Merge "S-on-R: Fix WifiNativeInterfaceManagementTest" into sc-dev