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: Ib8ac8908eeffdc2e11e78320da642b8e205ba61d