Merge "Add owners for GKI directory." am: 48b0b40852 am: c493aa5ee9

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

Change-Id: If235d2317dc44164aca9c6c71a6aadebf7cc3cb0