Merge "Add config to only allow auto select of networks" am: e6607763b2
am: 8d6bfa60c8

Change-Id: I6b6dfca6b33cf4ed33cb749636d5bd233e29f9c5