[automerger skipped] Merge "new telephony annotation class" am: 9e2e989423 am: 2344dd0745
am: 11057e516a -s ours
am skip reason: change_id Ib4e774fc93c0b3ebed70775d4a613621b9c7778a with SHA1 227e06fddd is in history

Change-Id: I67bf0b69e3757b849217b922b4fd6b2b313342cd