Merge "Restructure Module code [ com.android.tethering ]" into rvc-d1-dev-plus-aosp