update engine: fix gnu++20 build am: 95bc6fb2c8 am: 6888c1ba8a am: 1a2a93b0a0

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/2834790

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