Merge "DO NOT MERGE: SF: Fix a race between layer creation and apply transaction" am: f61f48bc

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



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