Merge changes from topic "HfpClientVendorAtCommand" am: 35593c0bed am: f2fe97bb75
am: ba6ae63aa4

Change-Id: Ic8eca34de074025865df5056e5cb65fa419eb705