Merge "Fix wrong log and import order in PhoneInterfaceManager" am: c41da93a4a
am: f78c740f01

Change-Id: I164fbb8d5504d718a40e8212b6ca4a686f3a94fd