Merge "Add test for CM#[add|remove]DefaultNetworkActiveListener" am: 2086865010 am: c345dec57b

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

Change-Id: Ifaa9743d1d267b073f724de93f797b1b88dbb550