Merge "BinderProxyTest: fix failures" into main am: 485c0d62ff am: 394fc245e5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3381385

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