Merges ContextHubService notion of hub ID/handle

Bug: 67734082
Test: Run CHQTS, verify pass
Change-Id: I800bde6fd1c5c503f35d72b58e360ec0ebb204b5
4 files changed