Merge "ContextHubService: Pass on query requests" into oc-dev am: befd33975c
am: 2f23a1a7a1

Change-Id: I3392ad2be1113bf69381e0c7f108bb9ca1a59492