Merge "Use framework-connectivity-t instead" am: 5cc9b26fc8 am: a997ba2d3f am: e8d00c4802

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

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