[automerger skipped] Add NR to preferred network type combination
am: 32993551f3 -s ours
am skip reason: change_id I08a8f7bf44a62ef109583b82b22f65fd6f89c71d with SHA1 8bcdc4cf66 is in history

Change-Id: I17e71193ca71314fc722a4d239e34db05790d899