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

Change-Id: Iba93c5f26010f647c78aef359e907d5f3b40fde0