Merge "Revert "have PhoneInterfaceManager use phone obj with default subid instead of""