Merge "Only allow libconnectivity_native usage on U+" am: f9f9784d4c am: a37da289cf am: 61a99809d0

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

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