Merge change I17f45d35 into eclair

* changes:
  Unhide SearchManager.SUGGEST_PARAMETER_LIMIT