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

Change-Id: I4bc97feb2ad59a7455a33c17132447e35fd7bf99