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

Change-Id: I3aec587d274271c5521fd47ab8a5f9c9ad1094fc