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

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

Change-Id: Ia3a9fd19a7ca46fb750c4319db4ad1d6a1c7cbea