Merge "HFP client volume control"
am: 639e30b222

Change-Id: Icc907c86cc0ab198946c8adbc265c305b20149cf