Merge "Remove dependency on framework-connectivity-test-defaults" into main...

Merge "Remove dependency on framework-connectivity-test-defaults" into main am: 1e566026 am: 3ec8fb8c

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



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