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

[automerger skipped] Merge "Ability to configure NR dual connectivity" am: 974ddb9f am: 74b6ba9f am: d6e31543 am: 35706cac -s ours

am skip reason: Change-Id I628edc2d6157ab2db279c2f32deb57798f2dd9ce with SHA-1 edeee5a9 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1473537

Change-Id: Ib9f1bc5a2f75747e1095ac31648db340c4abb537