Merge "Add TelephonyManagerTestApp" am: ed5f7e23ca
am: 7c9c9a79a6

Change-Id: I10b32bedc5a8839fbecf7df49f321c727c33850b