am f96a79a0: Merge "Add getDeviceId to PhoneInterfaceManager to give id independent of SubInfo." into lmp-mr1-dev

* commit 'f96a79a01efa428ae5761e04d63434c6153783e5':
  Add getDeviceId to PhoneInterfaceManager to give id independent of SubInfo.