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

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

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