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

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

Change-Id: Ief8218d65f06836fbd5c14fe568f161d3e0b86af