Merge "update requirements for TelephonyManager.getDeviceId" into gingerbread