Merge "new telephony annotation class"
am: 4d5ceeeb0f

Change-Id: I0bbea6ae204a899f050c146e1d528eee246a27f3
tree: 10e23976479055f530b5b4f9e4df66d1cbd7ad90
  1. framework/
  2. OsuLogin/
  3. OWNERS