Merge "Tethering: fix using wrong subId problem" am: 899f397175
am: ee1bc0f311

Change-Id: I32e238c4786657ecd4bacfa3260c28c3f083cf08