am 1bf518d8: Merge "Add TelephonyManager.getCurrentPhoneType" into honeycomb

* commit '1bf518d8b333768e26bacf340f88f7d4ba8b9a91':
  Add TelephonyManager.getCurrentPhoneType