SurfaceFlinger: Revert accidental change

An accidental change that was supposed to be reverted snuck in to a
large stack of CLs while they were being rebased/split-up.

Bug: 186200583
Test: Existing tests pass
Change-Id: I5694a18f491b3ac1f6464ddf6c14a245b5022208