Merge changes from topic "split-pre-jarjar" am: 0ad3becd60 am: 3291082812 am: 56bd785571

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

Change-Id: Icd5668a7ec3b1d0a46f490e3c50b7a211181913a