Merge "Add jarjar rule for android.support.v4" into tm-dev am: 3e5bd5cad1 am: 2eb14ceb44

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

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