Merge "Fix crash associated with invalid sub id in PhoneInterfaceManager" into mm-wireless-dev