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

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