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

Change-Id: I23f5c047f63fa585a49c5daf935931e0dec92ef5