Merge "Only use framework-connectivity stubs for -t stubs" am: a9fa050bdc

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

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