Merge "new telephony annotation class"
am: 386027afdd

Change-Id: I0bbea6ae204a899f050c146e1d528eee246a27f3