Merge "Shell commands to tweak uid rules on FIREWALL_CHAIN_BACKGROUND" into main