Merge "Ability to configure NR dual connectivity" am: aa756e198c am: d54065a670 am: 0589ecb8ce

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486306

Change-Id: I963cdcb960124643aa12760073dd34351921cd75