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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b44d8e25e3f0a4d596cef2befea52c2606c9a58