Merge "Restore saved network selection accordding to config.xml"
am: 094224702a

Change-Id: Ie071650b269133e0ac35d4a6133afb7fdfa16361