Merge "Add ncid to CellLocation in CellIdentityNr" into rvc-qpr-dev am: c8eaff3037

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12469801

Change-Id: I2927aafb6d15fa21b01a03d2695dbcc95c4c50d7