[automerger skipped] Merge "Add test for Vpn#prepare()" into sc-dev am: f89a629776 -s ours am: 56e4a33fd8 -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: Icf57ab535d58d93bfe07076b40a8c2169f2aa5d7