[automerger skipped] Merge "Add NR advanced capable by PCO" am: 68b044d5 am:...

[automerger skipped] Merge "Add NR advanced capable by PCO" am: 68b044d5 am: 7053c1aa -s ours am: bf5921d1 -s ours

am skip reason: Merged-In I537ff80f595293f2e58b5333cb9a8e570bda128e with SHA-1 4d607dab is already in history

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

Change-Id: Ibfdc01daecf11456630339ad06a90c14538d85e5