[automerger skipped] Merge "Manual network selection by RAN type" am: b25740f083 am: f0200c74b7 am: 7ce3ee718b -s ours
am skip reason: Change-Id I7076da1734d2d020adef568188cb4f4b4914f379 with SHA-1 3efba537fe is in history

Change-Id: I1cac7b127493977ca424f159a66be62432ee55d5