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

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

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