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

[automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" into rvc-d1-dev-plus-aosp am: 75c5696d -s ours am: 534129a8 -s ours

am skip reason: Change-Id Ide2ba760c0552e614635b3e402890b587ddc3c4c with SHA-1 42061087 is in history

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

Change-Id: I4952e2e15004f71f94403909a3360c85a08a3027