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

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

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