Merge "Mark parameter as [[maybe_unused]]" am: 3e9360e737 am: bb8f7fdbe2 am: 177c9cad23

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

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