Merge "add missing annotation for TelephonyManager APIs"
am: 792ce880ad

Change-Id: Ieb46456932dae085d7d2a4756619902047db40de