Merge "Add test for default network activity APIs" am: 0d56157186 am: d41a3fc42d am: 9d2070cebe am: c2d4170b6f

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

Change-Id: Iecdb564b05f207e19b8210a0d990ca75670c1c7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>