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

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

Change-Id: I1903372a660a00fe58ef6c36c2802066394e2776