[automerger skipped] Merge "Change tethering file structure to respect its package name" into rvc-dev am: ee6107e51c -s ours

am skip reason: Change-Id I7401c550fbafd17a5ed2d925b5d0e17e358af467 with SHA-1 d995566700 is in history

Change-Id: I0994b834ff0af2ebee3cd7e5bc9c73c4b08a4c99