Merge "Remove keymaster HIDL entry in compat matrix." am: 17ca272c5b am: 3e9bc99d07 am: 8877ffd29d am: 400423c00f

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

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