[automerger skipped] Merge "SF: make...

[automerger skipped] Merge "SF: make RenderEngineThreaded::waitUntilInitialized more efficient" into udc-qpr-dev am: ba2bdaa5 -s ours

am skip reason: Merged-In I4d61240a76f3ca814c28ccba62626f8b43a125cd with SHA-1 36135d0e is already in history

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



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