Merge "Use jarjar rule generator for connectivity rules" am: 751e3419c1 am: d476563818

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

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