am aff0ac4d: Merge "Do not set the network mode differently for LTE+CDMA"

* commit 'aff0ac4d202934dde7765f7418ea2ad38b0c2faa':
  Do not set the network mode differently for LTE+CDMA