Merge change 7404 into donut

* changes:
  Integrate unsubmitted cupcake change 143447: 	CTS: add testcase android.telephony.cts.PhoneStateListenerTest
tree: 1600808094168fa1193705e11d645063c3c49950
  1. tests/
  2. tools/
  3. Android.mk