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

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

Change-Id: I1ad8f8eb00561377cff874a80cc43290d858e2a5