[automerger skipped] Merge "Revert "new System API for preferred network mode"" am: 4106e419b2 am: 164774b7bb
am: 81462faf05  -s ours

Change-Id: I99c9bff1cd5f6c5975a6a31ef4c89ba10ae3a1a2