Merge changes from topic 'bt-fix-hfp-headset-state-machine'
am: b8e57b0375

Change-Id: Ib15c181fe6ae74eb037818e677f31117a93054d4