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

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

Change-Id: I8e8c9caed3a14169d2b3de6de304ced3a7edbb02