Merge "Move gki to packages/modules/Gki" am: 7ceeaff895

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1433094

Change-Id: I254e6a4483d773228b5ba1427cd574587fe8266c