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

Change-Id: I21f759fc4b606bc76e9b5cddcaa8f2fafdc6a867