[automerger skipped] DO NOT MERGE Revert "new System API for preferred network mode"
am: 6180735106  -s ours

Change-Id: I60e8da4041207c602fa29c49fc0d88dfebab25b1