Merge "Remove usages of HFP Client audio state APIs" into tm-dev