Merge "Fix C++23 build." into main am: 7ce3c294c0

Original change: https://android-review.googlesource.com/c/platform/system/media/+/3497197

Change-Id: I372ee898ff8d3b66a288a44ad39af26320a8f3b2
Signed-off-by: Automerger Merge Worker <[email protected]>