Merge "Ensure shortcodes beginning 40xx are free of charge as per ITU spec" am: a1a71aaae4 am: 78647e84d2

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

Change-Id: I4e704efd3f1ae489d0ae96349118d9370886a88a