[automerger skipped] Merge "Change tethering file structure to respect its package name" into rvc-dev am: ee6107e51c am: 59caa047c9 -s ours
am skip reason: Change-Id I7401c550fbafd17a5ed2d925b5d0e17e358af467 with SHA-1 d995566700 is in history
Change-Id: If621a7a931ddbb417e85a6a2a28bc9c2811ad2e0
This commit is contained in: