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

Change-Id: Ie557fa9b2d425066c613ba8c869e45ced889d046