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

Merge "SurfaceFlinger: Correct logic error in early release" into tm-dev am: 7a85fb13 am: 45c0174a am: 21cc0b2a am: dcee090a

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



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