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

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

Change-Id: I2a61124c022fb663938426a4d92237fbd3b3afae