Merge "Change to treat preferred network type LTE as GLOBAL for non CDMA networks." into lmp-mr1-dev