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

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

Change-Id: I3b53305f9050931405d1e9a926f66960d648ae03