Merge "new telephony annotation class" am: 4d5ceeeb0f
am: d83ca44531

Change-Id: I558883c7fb94b9685da5f5c570d2d331a19ba6d5
tree: bd2ed02bf23b16b7dd54943c703af0d08a309728
  1. framework/
  2. OsuLogin/
  3. OWNERS