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

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

Change-Id: I7b23f423822aca51016029e9a998f98f394aae0c