The "mask police" stationed in high-crowd areas carrying bags of masks are gone as you surmised.
They appear to still be providing two masks per cabin, I got two in my cabin earlier this month on Sunshine, but who knows when they'll end this practice. They don't seem to be used much, at least they weren't on my sailing. They're not KN95's or anything special, just those regular light blue masks that are everywhere nowadays.