Merge "SmsNumberUtils: Remove usage of the following hidden APIs"