Merge "Fix render thread early termination" into android15-tests-dev am: d1e7e80e82

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

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