100% it's always a question of your resources vs theirs, but you're dead on to make it harder.
I'll just add to also turn it off, pull the SIM, and show in a Faraday bag on your way back too. If the recent reporting about ICE buying location data from ad networks shows anything, it's that they are interested in a capability of following people to and from protests. Graphene should obviate this by disabling Google Play services by default anyway.
You should leave your regular phone at home, go to another place, power on your other device, speak your part in public, then travel another location and power off. This provides no consistent start or end location to work with for a particular device.