am 543348eb: am d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev

* commit '543348eb94624907102c1baffe5bdaf1087fede8':
  Modify getDeviceId() to get device id independent of Subscription.