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

Merge "Fix Binder warnings after C++ bump to 20" into main am: b894c3ed am: 5cba717d am: 2f27235b

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



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