Merge "Add NR Cell Identity to CellIdentityNr" am: 2db4a029a8 am: 4e8aae0591
am: dda7b61fef

Change-Id: Ied4b0bb75e558c6fd45baf821f6320f308eecda6