Merge "Change tethering file structure to respect its package name" into rvc-dev-plus-aosp am: 223418c7 am: 82d23570 Change-Id: Ia259c371123c53c4778673d04360b7c1bf6f7210