Merge "ServiceManager APIs for Wi-Fi mainline module"