Merge "Add Setting for curating saved open networks." am: b3b665de22 am: 2aec2f7a9c am: 835db7f6b6
am: 17a040d48e  -s ours

Change-Id: Ic54b5dccaec681ad30c8370aab9cc704ed38622b