Merge "Add a unit test for a bug in registerDefaultNetworkCallback." am: b8178678df am: eabf1851e8

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

Change-Id: I659d9d2c079cb01081e7996e0ee4f081c81c9a9c