[automerger skipped] Merge "new System API for preferred network mode" am: 314dcd2874 am: 4560dbd05a
am: d2bd668324  -s ours

Change-Id: I14536beb5928bd6abb4ddc6a8e0f90b3710a692f