[automerger skipped] Merge "Add TelephonyManagerTestApp" am: ed5f7e23ca am: 7c9c9a79a6 am: 9434750960
am: 3f782c2762  -s ours

Change-Id: Ic609051f03ad92e2207f8181aba1543143e2ec23