surely "resident" would work, no? citizens and residents? going by your actual status within the country rather than a role which reduces all people to "customers" or "consumers" in their own state and of their own state. but again, they don't use this language for inclusivity. it's the same government that drafted the rwanda legislation and has people focused on migrants crossing the sea in boats.
or to put it another way. a very, very, tiny minority might prefer it, though resident with an asterisk or forward slash would still make sense, but works to redefine the role of the majority of citizens which actually own the state. and assuming you've been living 30 years without being a citizen you've probably also paid lots of tax which puts you in the citizen category anyway in my book, whether you define yourself that way or not. you're paying for the services being sold to you.