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: I1e8c4e2f135f2a85acc5ea55b556fff857999be9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>