Merge "Fix Binder warnings after C++ bump to 20" into main am: b894c3edda

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2853597

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