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

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

Change-Id: I8bb32897ecce439bf010b39920eeea218bc1b9c9