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

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

Change-Id: I409ec9838a208647604d8975135bb408ae54c575