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

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

Change-Id: Ibf1f7a1247c4f0ea88fde12d88db93171df8f312