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

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

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



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