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

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



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