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

Change-Id: Id05b24ad970121c1a5bb65801ecdece56311408a