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

This reverts commit a5509e910c1983c217da0f0d18d79a250bb9867c.

Reason for revert: Broke build, see original CL for details.

Change-Id: I6d039698aa5a216b6123fdbea328a4a684f43e09
2 files changed