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: I892118930e9729c483523f8d337a76b28236c6c3