do not merge. Revert "do not merge. Remove voicesearch-specific functionality from framework."

This reverts commit f1b64f64.

It also updates RecognitionResult.java with changes made while it was in the voicesearch branch.

Change-Id: Ibffbe25397628a01ec49393a23c1825cef116501