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

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