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

Change-Id: Ib0ed8f4cff78b5caca69ee01cf00e6a03026a456