Merge "fix the issue that sending wrong preferred networktype to RIL" am: 695bbd1858
am: fe0d62af80

Change-Id: I4d87945a1774513963fd61d53be28bbe1bb0429b