Merge changes from topic "revert-32029057-mainline-supplicant-generalize-iface-type-NJLGVJHNTR" into main

* changes:
  Revert "Return an interface object from addUsdInterface in the M..."
  Revert "Rename IUsdInterface to IStaInterface in the Mainline Su..."