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

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

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