[automerger skipped] Merge "Manual network selection by RAN type" am: 6b86cf7884 am: 69038fbbbc am: abeac54c1e -s ours
am skip reason: Change-Id I0e8b78b1b16d4bf6a6c0f39eedc48b253ca7a810 with SHA-1 ccb14fbe63 is in history

Change-Id: I875cdeda84f22434576a07186e8cd2940007912a