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

Change-Id: Iec1dc482a9a20bdcbbdc513f9e2fd085ff87c411