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

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

Change-Id: Icc2d74ebc1bd11fd49aa258d93b9e984271f28bf