Upstream changes from Google (r714)

 - Introducing new public APIs in ShortNumberInfo.
 - Deprecating old methods. Also includes a refactoring change introducing
   a matcher API.