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

Change-Id: Ib740d7d217b33e3e5d9217eeb598c42341ed75a7