Merge "Add ncid to CellLocation in CellIdentityNr" am: c02910f164

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

Change-Id: I84ea44169995dafff41ce947abce91ec44118dcc