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

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

Change-Id: I348fcb5c0a9f18e618b67fe9c432dac08a084733