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

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

Change-Id: Ie945ff1b93650a7f7575f03516855d890104c323