[automerger skipped] Merge "Implemented a new manually network selection API" am: 7a1f37a5cd am: 870ecb3db7
am: 93459cb065  -s ours

Change-Id: Ic32507a696ba023d40847228ec99fcd6a37777d5