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

Change-Id: I224cb24b5f3f6dc85045df85affec15dd2e654be