Merge "Revert "new System API for preferred network mode"" am: 4106e419b2
am: 164774b7bb

Change-Id: I6f825cf29b11a6b212e5beb163fed01f063befc0