Merge "have PhoneInterfaceManager use phone obj with default subid instead of global mPhone object"