Use SubscriptionId instead of SubId

Update the api to use SubscriptionId instead of SubId.

Fixes: 35766624
Test: Existing unit tests pass
Change-Id: I6f99da3bf533cab74f5ec81aac4f62e63d55378a
Merged-In: I6f99da3bf533cab74f5ec81aac4f62e63d55378a
3 files changed