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

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