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

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

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