Merge "Support Free Shortcode for TracFone Customer Service" am: d673dddb01 am: c2d8e1d446 am: 3592351313

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

Change-Id: Id1be7e301e481af06e431f8e5093ec9e357edc39