Merge "Fix fmq_test when HIDL is not supported" into main