am 2515cf85: am 98e0b146: Make PhoneStateListeners not call TelephonyManager

Merge commit '2515cf85d50ef137a6e4a15a79a75a51c923ce6f' into eclair-mr2-plus-aosp

* commit '2515cf85d50ef137a6e4a15a79a75a51c923ce6f':