[automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" am: c8769826af -s ours am: c443756c47 -s ours am: 70ad46dddc -s ours am: b99cbc3ecf -s ours

am skip reason: Change-Id Ib4a3a7a14d7d0e544aadf1bfb21ad390f1ba76a7 with SHA-1 571a934615 is in history

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

Change-Id: I26b9652e1951f6be776d75707890ed563c6e66ec