Merge "Fix empty network type list in triggerEmergencyNetworkScan"