Merge "Firewall: Support a greater number of apps/uids"