Merge changes Iadfd290c,Ib9d5173a into main

* changes:
  Implement the remaining USD methods in the mainline supplicant.
  Implement getUsdCapabilities, cancelUsdPublish, and cancelUsdSubscribe in the mainline supplicant.