Merge "Allow INVALID_STATE to be returned for setNrDualConnectivity" am: be01266c63 am: 5068a9fec7

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

Change-Id: I647e9d0cc2fbcadd6688ed55c2c69a1f539e58cc