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

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