Merge "Add shared jarjar rule for tethering tests" am: 29dc671218 am: 2dc283eeca

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473223

Change-Id: I34c41fbbe5f034a2ed332c784ab0decb2c6b2add