Merge "Revert^2 "Move service-connectivity to the tethering APEX"" am: 2f0fafeb11

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542626

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5dc50e0510e1716db733fec6fa56adfe91ac4cc0