am d455608f: Merge "update requirements for TelephonyManager.getDeviceId" into gingerbread

* commit 'd455608f055a5ad735bc0b57934804de503334c4':
  update requirements for TelephonyManager.getDeviceId