Merge "update PhoneCfgMgr and PhoneIfcMgr to handle enableModem more accurately"