Merge "Add ncid to CellLocation in CellIdentityNr" am: c02910f164 am: c4a8dba971 am: 99f82fcc31

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

Change-Id: I58bf98e5c30f826698a8057f41c6f5fbbccb60d1