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

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

Change-Id: Id59edf5972e64c4245e4082cafe9411f223d28ad