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: 1aa8269a am: 8bbffe9c

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



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