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