[automerger skipped] Merge "Remove keymaster HIDL entry in compat matrix." am:...

[automerger skipped] Merge "Remove keymaster HIDL entry in compat matrix." am: 17ca272c am: 3e9bc99d am: 8877ffd2 am: 400423c0 am: 9277965a -s ours

am skip reason: Merged-In Ibd115673d6776c94150dd57afe3e20718bc2ed8f with SHA-1 98e5f9a3 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2187957



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