Merge "Remove call identification APIs." am: 397c5f1f38 am: acb926d183
am: 446c5968b6

Change-Id: I74989c8ba1fb3b566bb063db7007320f95c238bb