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

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

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