Merge "SurfaceFlinger: Revert accidental change" into sc-dev am: 63787777eb am: ab3c8d659c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15066709

Change-Id: I5cc54e154eec29a236a5750fa4bc2d9b06fdb42d