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

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

Change-Id: Ie1e828e976b798c65df688b2ce43f60fc07d633b