Merge "BinderProxyTest: more time to get proxy" into main