Merge "update PhoneCfgMgr and PhoneIfcMgr to handle enableModem more accurately"
am: e7a5458c16

Change-Id: I4833116d26ddf8148e12c3aac659f55c31502d58