Merge "Load Constellation FTEU ShortCodes 20201" am: 9974b955e5 am: 97ef4addca

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

Change-Id: I27f74571b4c13db1a322d8e180966090a36c4b9a