Merge "Remove dependency on framework-connectivity-test-defaults" into main am: 1e5660261e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2999776

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