Merge "Add NR Cell Identity to CellIdentityNr" am: be5b40b90f
am: f193d1032b

Change-Id: Ifc61fe1227a5a87387b45e0fdc71c5107bf1204b