[automerger skipped] Merge "fix the issue that sending wrong preferred...
[automerger skipped] Merge "fix the issue that sending wrong preferred networktype to RIL" am: e9583c8c am: 68761d25
am: 047ff024 -s ours
am skip reason: change_id I794e5cc35120d2ee92e6278d2ed1f39569ed5267 with SHA1 5105c8d5 is in history
Change-Id: Ia1f2e62c069b53a60b48a5bf6b9141a36afa8334