[automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" into stage-aosp-master am: 7ba7715c73 -s ours

am skip reason: Change-Id I68cc959b56d5984b038cea4c621c60f34472f34c with SHA-1 54c723074a is in history

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

Change-Id: I0bed410286e6a199774856e053f41a7872079fac
tree: 0899c647b643f14a64d478969d222600e6cfaf03
  1. core/
  2. services/
  3. wifi/