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

Merge "Remove com.android.i18n.phonenumbers from libcore packages" am: 0d80c5c4 am: da8ead72 am: 03559ada am: 6dac0c69

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

Change-Id: Ib49c6557e1994f4ea8d1247fd34ad202b16f9daf