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

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

Change-Id: Ia6fd2c693905ecda65c88305c4f71d2d5fd567bd