Merge "Make sure manual selected network is shown in next search result."
am: 4e4cbf37fc

Change-Id: I26ce564ac12b6b50d66a7d0d56fd01275d8a7d36