Merge "Remove Private API Tests for PhoneNumberUtils" into froyo