[automerger skipped] Merge "Update TEST_MAPPING for VPN tests" into main am: 807c412ae8 -s ours am: cca95eb3b0 -s ours

am skip reason: Merged-In I9da0a93761dacf74c1a77862425fcf34d8cce877 with SHA-1 c0671221a5 is already in history

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

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