Merge "Add BinderLeakTest and BInderLeakTest_legacy to general-tests" into main