Am I eligible for the automatic visa extension until the 30th if I have already done a normal extension?

Can someone please fill me in on the automatic extension.

I did an normal extension back on March 19 after a Visa Run to Cambodia in February.

Right now I have the letter from the Canadian embassy and due for the emergency Covid extension. On the 19th

Am I covered under the new automatic extension and good to go till the 30th. Or is that just for the first normal extension.