Merge "Device could not use wifi hotspot when data card switch to sim2" am: cd24e832e8
am: 012a279038

Change-Id: I5e3aac3d3181aaae02e5568923154cd89f427380