Merge "Fix Libbinder RemoveFromCacheOnServerDeath test" into main