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

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

Change-Id: I9794277877130e4d9019878261e62dd18906806a