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

Change-Id: Ibeb3c0d6f5fe54298a44a6a618e103aa710999d6