Merge "Build targets for checking GKI KMI compatibility" am: 3e7e4f8816 am: bb8b18a206

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

Change-Id: I5f81348b186f38f0eef715066d177ffbe48093e2