Merge "Add jarjar rules for service-connectivity-tiramisu-pre-jarjar" am: eead25d263 am: d743f4bfc8 am: 6754e1eafe

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

Change-Id: I6c2214269e94e05946c3e33a3213a690d25ff95b