Merge changes from topic "move_fmq" am: 1fa07549e1 am: 1af8658a9b am: f88f876f3d

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

Change-Id: I92e4ac1f6e8c53c3f6bc113b0179efa0eaa857d8