Merge "Fix jarjar rules for tethering apk" am: cce6a8bc0a

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

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