Merge "SurfaceFlinger: Correct logic error in early release" into tm-dev am: 7a85fb13e3

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

Change-Id: I1b6024347c75aeb2d8bd3586ca2ad3779a45b5ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>