Use SubscriptionId instead of SubId

Use the renamed methods in ServiceStateTable which refer to
SubscriptionId instead of SubId.

Change-Id: I4e38b1bc9bc1a5fc488e7450e9e798c9873258b2
Fixes: 35766624
Test: Existing unit tests pass
2 files changed