Merge "Remove com.android.i18n.phonenumbers from libcore packages" am: 0d80c5c432 am: da8ead7229

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675524

Change-Id: I3abb84cc11863a37e3d0f63c7c9c8ea0b56ef7dc