Merge "Add FREE ShortCodes for EG and NG for Constellation Project" am: f3294a0d02 am: 471488ef77

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

Change-Id: Ib90db7132be0fe8b6506315b335bd35c8a461a2a