[automerger skipped] Merge "have PhoneInterfaceManager use phone obj with default subid instead of global mPhone object" am: 4549a2a1dc am: f9d3d2bd59
am: 96a1bb0de5  -s ours

Change-Id: Ice21d8dc44109c1e3693c312e729efb557681168