Merge "Only allows Carrier Merged WiFi when APM is on" into sc-dev