Merge "Fix fmq_test when HIDL is not supported" into main am: aeab14d52c am: dd0e9ebedb

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

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