Fix C++20 build am: 693745f801 am: 244ee0642c am: c5278f0a76

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2858029

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