[automerger skipped] Merge "RESTRICT AUTOMERGE SurfaceFlinger: fix a potential...

[automerger skipped] Merge "RESTRICT AUTOMERGE SurfaceFlinger: fix a potential race condition in stealReceiveChannel" into sc-v2-dev am: 8762075b -s ours am: a3be2805 -s ours am: c8c2c257 -s ours am: 976ab024 -s ours am: 636d687e -s ours

am skip reason: subject contains skip directive

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



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