Merge "Properly unlock on return in process thread" into tm-dev am: 91bd1193

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



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