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

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

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