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: Iddd8043dc128b53e2d2c0533aea954f0a7ac43bb