Merge "Move FMQ tests to hardware/interfaces" am: 96b3cce92c
am: 35b5786cd7

Change-Id: Ic58fe49fb0ebe482f591174d8594ab9956e0b2f6