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

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

Change-Id: I2bfa4942fb9696189f9973553f250e859b1c8df2