[automerger skipped] Merge "add missing annotation for TelephonyManager APIs" am: 792ce880ad am: 7ce366a28e
am:a465f8907f-s ours am skip reason: change_id I39cb57db7cc1105bf74eb18ecf15ddbdc6e44f0c with SHA18be2a2ed14is in history Change-Id: I406ccd6166edd2206aa64c3029e7c340ac60b563
This commit is contained in: