Revert "Restore Null Device Id for PHONE_TYPE_NONE Devices."

This reverts commit 5da49ff25b3f1070f6fc14aed8d16f55c39cfbe3.

Bug 4964762

Couldn't get this fixed in time without causing other problems.

Change-Id: I3d62787fb34014ab37b4aa4c1dd7c5ea5ca3777e
1 file changed