Merge "have PhoneInterfaceManager use phone obj with default subid instead of global mPhone object" am: 4549a2a1dc
am: f9d3d2bd59

Change-Id: Ie07e84416b8f8dac13a164af4c87a3d5aacd0453