Merge "BinderProxyTest: fix failures" into main