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

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



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