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

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

Change-Id: Id8b2ee46424ff444380c931f5493f14b6ac9057c