Merge changes from topic "HfpClientVendorAtCommand"
am: 35593c0bed

Change-Id: I986909f2dc253915ccb3bd66a39f38b2c4a9b761