DO NOT MERGE: SF: Fix a race between layer creation and apply transaction am: 0fd0fca48a am: 829b48dd85

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

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