Android 9.0.0 release 21
fmq_test require dependency. am: a7d46a97d3 am: 8696d6faee
am: f5852b8797

Change-Id: Ia3f041f6c1d00cf2fef939e30c14c012f805305c