Merge "VCN: Explicitly handle IAE from updating underlying network" am:...

Merge "VCN: Explicitly handle IAE from updating underlying network" am: 9c30117b am: 408a6ca7 am: 265fce32 am: 4416a185 am: 5630e7a0

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



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