[automerger skipped] Merge "Change tethering file structure to respect its...
[automerger skipped] Merge "Change tethering file structure to respect its package name" into rvc-dev am: ee6107e5 -s ours am: ecb1962f -s ours
am skip reason: Change-Id I7401c550fbafd17a5ed2d925b5d0e17e358af467 with SHA-1 503be61a is in history
Change-Id: Ib6dcd4f4682c18062b8fd964ad390580fa8df5fc