Merge "NetworkPolicyManager: Add @SystemApi for mainlne module" am: c8b7cff7f4 am: 3ba215eefd

Change-Id: I5682ed5f580f762beb0bf552c44d73495077cad3