am feb81e96: allow TelephonyManager.getDeviceId to return an ESN instead of an MEID

Merge commit 'feb81e9679e98460efe46fc578617ef0c6b85c14' into gingerbread

* commit 'feb81e9679e98460efe46fc578617ef0c6b85c14':
  allow TelephonyManager.getDeviceId to return an ESN instead of an MEID