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

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

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