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

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

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

Change-Id: I40470c84f2d147e97a347a402bec2ed4dcc45c0b