Merge "VCN: Explicitly handle IAE from updating underlying network" am: 9c30117b am: 408a6ca7

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



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