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

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

Change-Id: I3152dc7aa45e9bb02876d049c8f812cb6aa9d519