Merge "new telephony annotation class"
am: 9e2e989423

Change-Id: I006c49adeaa3dc2a81d1abfa2cdcc71c82888db8