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

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

Change-Id: Ie0e659de876786a0e539f092d7fc349b86d70c14