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

Change-Id: Id9e2e952287a7842c91d62fdf17a2383df508049