Merge "Revert^2 "Add service-connectivity to tethering APEX"" am: 73fa31b404

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I15564a42939ccdc54954e4d130b6236bde94864b