[automerger skipped] Merge changes from topic "nr_advanced_pco" am: c7dc05a9...

[automerger skipped] Merge changes from topic "nr_advanced_pco" am: c7dc05a9 am: a53514e2 am: a46f599f -s ours

am skip reason: Merged-In I52a07d19fe9a25bc05fdb0b3bf5abd92cf684987 with SHA-1 739f5f63 is already in history

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

Change-Id: I5e6fdd3b616ab42c18ceb05ef2cfa7c7cae16ac7