Merge "Fix jarjar-related failures in coverage tests" am: e9f7f1e3d4

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

Change-Id: I4a380aba04862af13f01a9d02e3e27c86b22c111