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

Change-Id: I6cd0909f68d81215d69ec4127aac0d4f76f76214