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: I486e648d1316e397657f151808ed22f9a6371385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>