Merge "Create a test for GKI KMI compatibility" am: dfbbfab539 am: 0deaac3ac1 am: b46dda7171 am: 9c99f18621

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

Change-Id: Icd5fdce2c7cac5cd44d7ff0d746a29cfc2d0104e