Merge "Update test_mapping with the new network policy tests" into main am: 49bba3e309

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

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