Merge "Convert development/gki/Android.mk to Android.bp" into main am: 4f1fc99424

Original change: https://android-review.googlesource.com/c/platform/development/+/3066705

Change-Id: I9b60c2c4c3bb7add401c437d212a2517a48a4d26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>