Merge "SmsNumberUtils: Remove usage of the following hidden APIs" am: 6052ca74cd am: e294de2414
am: 2380f6153e

Change-Id: I720c0a8ec995210cf53fa3c9e3c20bf9aa96bc23