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

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

Change-Id: Ib6505c6ad261ff8f38d98df90af5a74b8a003d51