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

Change-Id: I9371ce3507407f33c676b168e9c5da057444d9f2