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

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

Change-Id: I9af51b515f751b0298f0cce8cadec887448dd4a4