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

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

Change-Id: I2b1e5ed720d2ca97f740713ed3b24a119edc8f28