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

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

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