Merge "Update Telecom APIs to include multi-hfp" am: 025718e8f6 am: 3dd41b7b29
am: 518a82c94a

Change-Id: I0309cfd98f38a54b741a9dc09d1fb65159d5a4b7