[automerger skipped] Merge "Add ncid to CellLocation in CellIdentityNr" am:...

[automerger skipped] Merge "Add ncid to CellLocation in CellIdentityNr" am: c02910f1 am: c4a8dba9 am: 99f82fcc am: f9864551 -s ours am: 31d2774a -s ours

am skip reason: Change-Id Ib894e83900b590c11221502ad039781cea5b571c with SHA-1 69e53926 is in history

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

Change-Id: Iea0176400d0272cd6840c4da93449a0fefeace7f