Merge "Migrate the NetworkSelection settings"
am: 35659d9346

Change-Id: I81f97b156c0de11f6c34eb35993f9552a6bd9d25