Merge "Manual network selection by RAN type" am: 6b86cf7884 am: 69038fbbbc

Change-Id: I0973dc1394cd0b9baa8d928e2f8b6cf2758e18f5