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

Change-Id: I43b606e03b9c3276ba7996a5f7feede5d31c0b01