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

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

Change-Id: I24795bc612d7956ea8f2776c90810ea5c5eca39e