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

Change-Id: I68546e0c0cbd8c2ec9606b4fd064f9e31083eb05