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

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

Change-Id: I3945c0c844b8b4e8877d36884bffa9194962e609