Merge "Add TelephonyManagerTestApp"
am: ed5f7e23ca

Change-Id: Ie1f3aa4dd418de8b1544d0149584dcde090992d9