Merge "Fix build error for clang update" into main am: 5ee8de30a7

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

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