Merge "Allow usage of SdkLevel in the framework/wifi services" into sc-dev