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

Change-Id: Ibc3e52b0a109843808a6042a3e41530f1fdf5a17