Merge "Restrict lockdown and firewall to AID_SYSTEM." into jb-mr1-dev