[automerger skipped] Merge "Change Tethering package name" am: 7b2a29361c am: f44a25f10d am: 4f45f0d642 -s ours
am skip reason: Change-Id I2c7647abb996539a3af6cfe0e0214a5e8927c0d6 with SHA-1 58b0f233c5 is in history

Change-Id: I9e2d1a340289e461bc072f1684cb11b06679d514