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

Change-Id: I27922fafa9c092e281c80fc6aa5f96c8e4e0c461