Merge change 7953 into donut

* changes:
  Integrate unsubmitted cupcake change 131145: 	CTS: add test cases for telephony.CellLocation, PhoneNumberUtils, 	PhoneNumberFormattingTextWatcher, NeighboringCellInfo, ServiceState and TelephonyManager
tree: 07dcdbc9b6d78ede5413aeaf89c6cd4f398bde45
  1. tests/
  2. tools/
  3. Android.mk