Enable passing additional parameter to metering query

Make the additional_query variable parameter of the query_data function,
so that we can pass additional query options to this function.

Change-Id: I23032803f08c2e2c1d5946f4ce8415c7c72c87f0
Merge "Enable passing additional parameter to metering query"