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

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

Change-Id: I885428ad0185c8e8a2b641797bbbe18ba50e6240