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 am: c02c3480

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



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