Merge "Disable SelfManagedConnectionServiceTest#testEmergencyCallOngoing." into oc-dev