Merge "Correct the calling method in removeDefaultNetworkActiveListener" am: a6e3069c27 am: 7c04a51a95 am: 97fa4cc109 am: 3007db2308

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

Change-Id: I160212a4320fd4abe4aa8a3f63734917e450fd9a