[automerger skipped] Merge "Add NR to preferred network type combination" am: 996f047394
am: 21cdfe4c14 -s ours
am skip reason: change_id I08a8f7bf44a62ef109583b82b22f65fd6f89c71d with SHA1 32993551f3 is in history

Change-Id: I699396e5ecc42551939fcd39716a9fc4d6e0c6fd