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

Change-Id: Ifa5956f28ae3581e96f4e9be81cde5c54ddeeedd