Merge "fmq: use versions for imports" am: 334a6134de am: d0ac680be2

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

Change-Id: Iaa6fa994d8dfc730e7a19d25061d293766c682ac