[automerger skipped] Merge "Deprecate NetworkPolicyCallback and related APIs" into main am: fc72787d02 am: fb016bf8a8 -s ours

am skip reason: Merged-In I3242924c032e9fe9738f0b03c34e2ce4054293ef with SHA-1 368336fed2 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3180203

Change-Id: If1098917f9d39b92abebb5acf85fc1c3f6b1b8f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>