Merge "Ensure SpiUnavailableException was thrown because of duplicate SPI" am: ef716bcb94 am: 93165a4497

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2015999

Change-Id: I8683ed966c4d53960d5ed768f8466b3e9e23c59b