[automerger skipped] Merge "fix the issue that sending wrong preferred networktype to RIL" am: 695bbd1858 am: fe0d62af80
am: 6a63dce9b9 -s ours
am skip reason: change_id Ifb1fc21423a09f0d000553d4d06bafa023adc9d6 with SHA1 6aeb662ac0 is in history

Change-Id: I1e58fd0ace426a549c1a08a65fba4058e9490058