[automerger skipped] Merge "Change tethering file structure to respect its package name" into rvc-dev am: ee6107e51c -s ours am: de4fb9898c -s ours am: 9565042fd6 -s ours am: af7e2e46f1 -s ours
am skip reason: Change-Id I7401c550fbafd17a5ed2d925b5d0e17e358af467 with SHA-1 7dc2dcc37a is in history
Change-Id: I8970b9ea2c406daef7ef3f1ad5f19e22b902f623
This commit is contained in: