Merge "Do not jarjar tests if explicitly excluded." am: fb94c31fc0

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

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