Normalize more characters in prefix searches

Normalize hyphens and the "modifier letter apostrophe".  The "modifier
letter apostrophe" looks just like a "right single quote" in many fonts.

Deployment: This requires an in place rebuild to take effect.

Bug: 73560
Change-Id: Icd912b6942b24b84cc2e1262b1fa2699ba87b8cf
Merge "Normalize more characters in prefix searches"