Merge "Device could not use wifi hotspot when data card switch to sim2" am: 675e2124f3 am: 2c9697b19f
am: f531d8edbb

Change-Id: I78b7a7256ce11017f5d790ed8989acc4c0ee467d