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

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

Change-Id: Ie7c3581e4bd0a6f2dd1f08c396494ccdbf1d7e72