[automerger skipped] Merge "Tethering: fix using wrong subId problem" into...
[automerger skipped] Merge "Tethering: fix using wrong subId problem" into qt-dev am: dd0b1d9b -s ours
am: 5b7535e6 -s ours
am skip reason: change_id I32e238c4786657ecd4bacfa3260c28c3f083cf08 with SHA1 06e478ed is in history
Change-Id: Id4158b035a7096d3301db52a9d17d92c317e1761