[automerger skipped] Merge "Migrate the NetworkSelection settings" am: 35659d9346 am: 1d95e4c43a
am: 9074a6492c  -s ours

Change-Id: If8d731033a52a5af7e6a7961256903451da3226a