[automerger skipped] Merge "NetworkPolicyManager: Add @SystemApi for mainlne module" am: c8b7cff7f4 am: 3ba215eefd am: 6eb36aca5b -s ours
am skip reason: Change-Id I56833254a93383e8054c96d296bcb54b777a6e33 with SHA-1 9204f468b0 is in history

Change-Id: I4b77614d2cc717938507bf4376b23b3f3042d579