Merge "Remove keymaster HIDL entry in compat matrix." am: 17ca272c5b

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

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