am d73a98c3: Revert "Restore Null Device Id for PHONE_TYPE_NONE Devices."

* commit 'd73a98c305bbecc5ec216f0a8c431cddcd0adff5':
  Revert "Restore Null Device Id for PHONE_TYPE_NONE Devices."