Merge "Use metered firewalls for metered uid policy" into main