tree 64fc1931aec6b91554f727441ff6a112c4fd6488
parent 0bf2dfbefcde24b3d2b8aada66ce516696b37ba1
parent f931a80e813954671211c58231465bbf62220e78
author Remi NGUYEN VAN <reminv@google.com> 1610418117 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1610418117 +0000

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