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: 95a92cb8

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



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