Merge "Fix render thread early termination" into main am: b657980c15 am: f83184b299

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

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