Merge "Remove the HIDL version of oemlock HAL from compat matrix"