Fix C++20 build am: 693745f801 am: 813b3f8eb4 am: 9baff9c12e

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

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