[automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" am: c8769826af -s ours am: b357c138f5 -s ours

am skip reason: Change-Id Ib4a3a7a14d7d0e544aadf1bfb21ad390f1ba76a7 with SHA-1 62822a92cd is in history

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

Change-Id: I509d8b350d9fea9757a0740704e401d39ab7f1de