[automerger skipped] Merge "Fix the flaky test MaxServerPrune_Binder" into...
[automerger skipped] Merge "Fix the flaky test MaxServerPrune_Binder" into qt-dev am: 9206a01c -s ours
am: 48ea6673 -s ours
am skip reason: change_id I04de6e3c7b1400a5a57daa1bf855330c20516db7 with SHA1 225825c7 is in history
Change-Id: I842c2d0284f771801b057003071f116cba7cd79c