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

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

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