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: 9ba71ca6 am: a6921b99

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



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