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

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