[automerger skipped] Merge "Add 1.5+ IRadio case to...
[automerger skipped] Merge "Add 1.5+ IRadio case to get/setPreferredNetworkType" am: c41f6d9e am: b7cad1b4 -s ours
am skip reason: Change-Id Ie389dc639ca8e058e34575fe24252fe54638d5ee with SHA-1 6baf9fbd is in history
Change-Id: Ic7de86757da33f403ec56d2dc9a5ce7a18de1b36