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

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

Change-Id: Ifab6fc40ba6b8805b64c71b88d24ee77fcd51285