[automerger skipped] Merge "Ability to configure NR dual connectivity" am:...

[automerger skipped] Merge "Ability to configure NR dual connectivity" am: 4011567f am: 365fe692 am: 59f0ff3f am: 59385ab4 -s ours

am skip reason: Change-Id I5c4ef71ac6535bcf7649598e82103bf4d2f9cb69 with SHA-1 671f4b55 is in history

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

Change-Id: Ib333659f66a542ce3e5287e8f353f7c57245e440