[automerger skipped] Merge changes from topics "addl_nr_band", "nr_advanced"...

[automerger skipped] Merge changes from topics "addl_nr_band", "nr_advanced" am: e8376888 am: 1b26bf52 -s ours

am skip reason: Merged-In I5ece455abc02efcbf59e8f658215d7bcd3a4d745 with SHA-1 eec464fa is already in history

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

Change-Id: I95c6cf1bdd287b284ef220596ad77387eb3dd937