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

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

Change-Id: I2222627db244bcd66ae62caed7457bb3bdeced4c