Merge "Make setUnderlyingNetwork() non-final" am: 142f5d2695

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2124555

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