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

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

Change-Id: I6ee21a34806b4d76f92b6ec042d6c16db81ff971