Merge "Restore HeadsetClientStateMachine.getCurrentAgFeatures() reporting of EXTRA_AG_FEATURE_VOICE_RECOGNITION." am: 7fc43f940c
am: 86734be0da

Change-Id: Ie35e8977407d608aef6a142ffe45756f350173e6