Merge "new System API for preferred network mode"
am: 314dcd2874

Change-Id: Ic1c8588f2d6d200adba6dcb10c2f991eeff630de