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

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

Change-Id: I779ad0a40a61486367d1a01ca2eb9942422bdca0