Merge "Merge "SurfaceFlinger: Correct logic error in early release" into...

Merge "Merge "SurfaceFlinger: Correct logic error in early release" into tm-dev am: 7a85fb13 am: 238d1d4b" into tm-d1-dev-plus-aosp am: 0d0b1664 am: 7b6fd0de

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



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