Merge "Fix C++23 build." into main am: b9ab3168d7 am: 8f40e4c4b2

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3497278

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