Merge "[automerger skipped] Merge "Convert VcnNetworkProvider to use...

Merge "[automerger skipped] Merge "Convert VcnNetworkProvider to use NetworkOffers" am: e98c9815 am: 65995498 -s ours" into sc-dev-plus-aosp am: bea8533c -s ours

am skip reason: Merged-In I88c69c0be9f6fd81839fb1595ed00341001694a5 with SHA-1 9dfb804a is already in history

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

Change-Id: I34ef4b4faa843abd372233e4f5a20209def1b66e