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

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



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