[automerger skipped] Merge "new telephony annotation class" am: 386027afdd am: 54aba99636
am: 3157fcdfd8 -s ours
am skip reason: change_id I37f8a0624bbf27f264870ee9dbf03d3aaa5cadc1 with SHA1 c9d4ee112e is in history

Change-Id: I103636898f05ba53a6249bf45e3806c82fab24e9