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

Merge commit 'c2bc31b45e14b1ea261492ee531ed5bb2aac12d4'

* commit 'c2bc31b45e14b1ea261492ee531ed5bb2aac12d4':