Merge "Implement registerSystemDefaultNetworkCallback replacement in api30" am: 7c2f81d7e1 am: 2d02bdb70d am: a0888f5e74 am: 7f11182279

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

Change-Id: Ic3b72f688b3adc469d8524040e90e1f7207af164