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

Change-Id: I08e0646c4dc20d45ea50d43d7e8b0deddf147bda