Merge "Remove unused paramters" into main am: 9a4cfcd8

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



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