[automerger skipped] Merge "Fix invalid CID for NR CellInfo" am: d618ad8f...

[automerger skipped] Merge "Fix invalid CID for NR CellInfo" am: d618ad8f am: 326e50d2 am: 51209c2d am: 5f729377 -s ours am: cedcd01c -s ours

am skip reason: Change-Id Id14e909dbce557e154af8eead546d85720428662 with SHA-1 dfcd2618 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1440294

Change-Id: I90db4bc41018c17bc696a88f99adb48840208b36