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

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

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

Change-Id: I6caabdd0f3bd35bc8bbed136450a4003e295083c