Merge "Manual network selection by RAN type" am: b25740f083

Change-Id: I635ef788b7c5e696ac95935306cecac407a2c047