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

Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/3499291

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