Merge changes from topic "move_fmq" am: 1fa07549e1

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

Change-Id: I6e299ec1a9e5ea564ff0b752c96d16eab754a472