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

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

Change-Id: Ic2780b825dddd9fecd136ba52040bd0f2a24cd38