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

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

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



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