Switch near_match field to match query

This has the advantage of being simpler and creating fewer term queries.
Also, it removes the double phrase searching were doing.

Bug:  68111
Change-Id: Ibdcad497b560679d1d6bbc177fcef9bb7f24d5cd
Merge "Switch near_match field to match query"