Merge "media.c2 client: fix # of queried param count" into main am: 5d9ef21a9a

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2979676

Change-Id: I6242dc6bceda616cf65ea5860c9d0dc0d746b135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>