[automerger skipped] Merge "Add NR to CellInfo" am: 35cf55c4eb am: ad7bacce36
am:e068056cf4-s ours am skip reason: change_id I9a34b57cebddb3be810b86080aff1022557c4c24 with SHA1b2edb53b7dis in history Change-Id: I4c0652c3e5225b5dd1fbd4d98e2d5187a0f4f22f
This commit is contained in: