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

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

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