Merge "binderSafeInterfaceTest: another quick flake fix" into main