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