[automerger skipped] Merge "Restructure Module code [ com.android.tethering ]"...

[automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" into rvc-qpr-dev-plus-aosp am: ec2ac826 -s ours

am skip reason: Change-Id I2accb96abbdfa665ef34aa79e87af040226bcf32 with SHA-1 c4319b3d is in history

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

Change-Id: Id1810bb9d1a4e911824207ae2f9b0daf16f4bf5d