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

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

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