Refactors ContextHubClientManager/Broker classes

Makes changes so that ContextHubClientBroker objects of different types
(callback or PendingIntent) can be generated.

Bug: 117612105
Test: Compile only
Change-Id: I2c2e15be8b62c2aedec67505f8f1ffedcbfb5d32
2 files changed