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: I9ea6a6049e500aeb522bc6224b28f783f601f6f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>