Merge "VPN: Explicitly handle IAE from updating underlying network" into main am: a6cf261f85 am: 12af8505bb am: edf258add5

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

Change-Id: I190abd46ddb9eed79692942fac85ae627b954efb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>