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

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

Change-Id: I4bba5b21351637c08a135b6c0c6ba9f7abb2c7c1