[automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" into stage-aosp-master am: 7ba7715c73 -s ours am: 80e5ee71f3 -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: I94b96c2777c28841a464808fb5bc44a5efe89a5d
This commit is contained in: