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: d940a445

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



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