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

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

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