Merge "Update AidlContextHubWrapper methods"