Merge "Use the new scan API for manual network search." am: 38e65295fe
am: 22b365898f

Change-Id: Ifeda2092efa6286f5faaf5aeea74a01ffc6ed073