[automerger skipped] [Tether07] Migrate Tethering into module am: 0df2ebc43d am: 6b828d2915
am: 146e4976bf -s ours
am skip reason: change_id I7e78c0e0a3e70f940a749ba2a39ece7c7ec5b9b3 with SHA1 0f63ca6e91 is in history

Change-Id: Ie6a28a142e2cf75adfc3d1a45d87e9daa67423e4