[automerger skipped] Merge "Add test for Vpn#prepare()" into sc-v2-dev-plus-aosp am: a38701c7fa -s ours

am skip reason: Merged-In Ibe0b245561b00442a6377fb849603f8b9026e9c4 with SHA-1 624edc3246 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16524180

Change-Id: Id9a7b18ad7303808b32d91fbba44b214a2bd6f16