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

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

Change-Id: Id4ffda212bb8a7435524fbe1e3ebc28e9ce06f78