Make search behavior match jb search behavior.

fixes b/6497634 carry over search results behavior from jb Gmail
Change-Id: I54cea6b8d828071ad841e1f42fbdece8a1aa159b
7 files changed