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

Change-Id: I0a88e3ccfca1618c275dfdc4694a9eb18f47e726