Merge "Remove com.android.i18n.phonenumbers from libcore packages"