Merge "fix the issue that setPreferredNW send wrong RAT to HAL" am: 4837dbe536
am: 3a720c6739

Change-Id: I2245e9a0fd7afac8835dbf1ead499153efa39e36