[automerger skipped] Merge "DO NOT MERGE: SF: Fix a race between layer...

[automerger skipped] Merge "DO NOT MERGE: SF: Fix a race between layer creation and apply transaction" am: f61f48bc am: 96f510a1 am: 6a675c20 -s ours

am skip reason: subject contains skip directive

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



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