Merge "Mark 'android.hardware.common.fmq' as available in any apex" into main