Merge "Merge "Fix render thread early termination" into android15-tests-dev...

Merge "Merge "Fix render thread early termination" into android15-tests-dev am: d1e7e80e" into main am: 271f07ac

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3342384



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